Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Mar 2012 05:54:12 +0000 (22:54 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 14 Mar 2012 05:54:12 +0000 (22:54 -0700)
commit0ceb80d308bfcd34c6350d34b353886bd91abd6f
treea4bc956c939f61170071ccc871cb87ec861a0d3a
parentec60973589ca5d22a53ef07381d85f628145fcca
parent048c5bb0a354e714e4e6d8270ceb7cf035e408ea
Merge from trunk.